projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5cb371 83b44e2)
bitkeeper revision 1.1159.32.3 (4120e70bXTpJy0O5vPdcj0GxE44yNw)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 16 Aug 2004 16:55:39 +0000 (16:55 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 16 Aug 2004 16:55:39 +0000 (16:55 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

1  2 
linux-2.6.7-xen-sparse/include/asm-xen/hypervisor.h patch | diff1 | diff2 | blob | history
tools/libxc/xc_linux_restore.c patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/xc_linux_restore.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.